From 8188a928c4562b666741ddd303353bd18e1396ac Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Tue, 8 Sep 2009 15:06:50 +0000
Subject: [PATCH] * updated mwe-error_load_lib error msg

---
 js2/mwEmbed/mv_embed.js                    | 12 +++++++-----
 js2/mwEmbed/php/languages/mwEmbed.i18n.php |  3 +--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js
index 792c859a7b..cb863e6966 100644
--- a/js2/mwEmbed/mv_embed.js
+++ b/js2/mwEmbed/mv_embed.js
@@ -118,7 +118,7 @@ loadGM({
 	"mwe-size-megabytes" : "$1 MB",
 	"mwe-size-kilobytes" : "$1 K",
 	"mwe-size-bytes" : "$1 B",
-	"mwe-error_load_lib" : "Error: mv_embed was unable to load required JavaScript libraries.\nInsert script via DOM has failed. Please try reloading this page."
+	"mwe-error_load_lib" : "Error:: Javascript $1 was not retrievable OR does not define $2"
 });
 
 /**
@@ -462,8 +462,11 @@ var mvJsLoader = {
 			this.callbacks.push( callback );
 		}
 		if( this.checkLoading() ) {
-			if( this.load_time++ > 2000 ){ // Time out after ~80 seconds
-				js_error( gM('mwe-error_load_lib') + this.missing_path );
+			//@@todo we should check the <script> Element .onLoad property to 
+			//make sure its just not a very slow connection
+			 
+			if( this.load_time++ > 4000 ){ // Time out after ~80 seconds
+				js_error( gM('mwe-error_load_lib', mvGetClassPath(this.missing_path),  this.missing_path) );
 				this.load_error = true;
 			} else {
 				setTimeout( 'mvJsLoader.doLoad()', 20 );
@@ -524,7 +527,6 @@ var mvJsLoader = {
 				if( !this.libreq[i] ) {
 					loadExternalJs( this.libs[i] );
 				}
-
 				this.libreq[i] = 1;
 				//js_log("has not yet loaded: " + i);
 				loading = 1;
@@ -541,7 +543,7 @@ var mvJsLoader = {
 			cur_path = (cur_path == '') ? cur_path + objPath[p] : cur_path + '.' + objPath[p];
 			eval( 'var ptest = typeof ( '+ cur_path + ' ); ');
 			if( ptest == 'undefined' ) {
-				this.missing_path = cur_path;
+				this.missing_path = cur_path;				
 				return false;
 			}
 		}
diff --git a/js2/mwEmbed/php/languages/mwEmbed.i18n.php b/js2/mwEmbed/php/languages/mwEmbed.i18n.php
index b3482fa49a..90d4f8e104 100644
--- a/js2/mwEmbed/php/languages/mwEmbed.i18n.php
+++ b/js2/mwEmbed/php/languages/mwEmbed.i18n.php
@@ -102,6 +102,7 @@ $messages['en'] = array(
 	'mwe-size-megabytes' => '$1 MB',
 	'mwe-size-kilobytes' => '$1 K',
 	'mwe-size-bytes' => '$1 B',
+	'mwe-error_load_lib' => 'Error:: Javascript $1 was not retrievable OR does not define $2',
 
 	/*
 	 * js file: /libAddMedia/mvFirefogg.js
@@ -228,8 +229,6 @@ $messages['en'] = array(
 	'mwe-loading_plugin' => 'loading plugin <blink>...</blink>',
 	'mwe-select_playback' => 'Set playback preference',
 	'mwe-link_back' => 'Link back',
-	'mwe-error_load_lib' => 'Error: mv_embed was unable to load required JavaScript libraries.
-Insert script via DOM has failed. Please try reloading this page.',
 	'mwe-error_swap_vid' => 'Error: mv_embed was unable to swap the video tag for the mv_embed interface',
 	'mwe-add_to_end_of_sequence' => 'Add to end of sequence',
 	'mwe-missing_video_stream' => 'The video file for this stream is missing',
-- 
2.20.1